Merge remote-tracking branch 'origin/upstream' am: 65408a8cd5 am: b32946e303 am: c1942f5a08

Original change: undetermined

Change-Id: Ia68fc9ed40f29373f1e480742aa9fa027e461d78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>