Merge remote-tracking branch 'origin/upstream' am: 68bc564c6f am: 280eea6ea8 am: dca6b7a419

Original change: undetermined

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