Sync with Google3.
am: d2c364b75f

Change-Id: I778933df4f865c0d411574b954bd2c75b141395c