Merge remote-tracking branch 'origin/upstream' am: 93e24a1529 am: 3c3c2a56ab

Original change: undetermined

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