Sync with Google3. am: d2c364b75f
am: 0206f5b9cd

Change-Id: I22d7dff37de9ffac4424b821f4280bed9a265443