Merge remote-tracking branch 'origin/upstream' am: 7ae6c851c8 am: 5140d78802

Original change: undetermined

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