Merge remote-tracking branch 'origin/upstream' am: 19e832d534

Original change: undetermined

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