Merge remote-tracking branch 'origin/upstream' am: e7fb98fce9 am: 702c06adb8

Original change: undetermined

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