Merge "Sync with upstream 643521d:"
am: 3cddfb862c

Change-Id: I1de18087fe19b5055b654a37e70bda8603b4b513