am 6e898084: am e28dde5c: Merge "Small optimization improvements."

* commit '6e89808475d70d4b4b2d0b6bcad38524b10cbeaf':
  Small optimization improvements.