Merge remote-tracking branch 'origin/upstream' am: 0ccd6fc43d

Original change: undetermined

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