Merge remote-tracking branch 'origin/upstream' am: be49714f29 am: 90c51db175

Original change: undetermined

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