Sync with google3. am: 044fd1a035
am: e75e62f0a6

Change-Id: Icf85c0d2cc356c9ff15c9003677f167746ff51e7