Merge remote-tracking branch 'origin/upstream' am: e446c1adb1 am: 9bb5f963ad

Original change: undetermined

Change-Id: I60ba7eb8f984e440615d69d6e58828362f564d5a
Signed-off-by: Automerger Merge Worker <[email protected]>