am 4e579792: am 1bf3f349: am 9bc32c62: Reverting this change to fix 2252466.

Merge commit '4e57979295d06d398fabdd3e02351bf87c377d67'

* commit '4e57979295d06d398fabdd3e02351bf87c377d67':
  Reverting this change to fix 2252466.