Merge remote-tracking branch 'origin/upstream' am: dab69ee29b am: 7df41c52a5

Original change: undetermined

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