am e28dde5c: Merge "Small optimization improvements."

* commit 'e28dde5c7907f14042a0c9bcfa8dad436a1d82f4':
  Small optimization improvements.