Merge "Minor improvement on static BCE analysis."
am: c5b76b9328

* commit 'c5b76b9328d77b83c80afed14a5b6e7009136e15':
  Minor improvement on static BCE analysis.