Merge remote-tracking branch 'origin/upstream' am: f0eba62f7c am: a0b694e0bb

Original change: undetermined

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