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

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