Merge remote-tracking branch 'origin/upstream' am: 3f5cc036b8 am: 565c8ac7de

Original change: undetermined

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