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