Merge remote-tracking branch 'origin/upstream' am: aaaa743877 am: 447eda6342 Original change: undetermined Change-Id: I374a2af91569599c5cfe25779efe5d1b8a13075b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>