Merge remote-tracking branch 'origin/upstream' am: 9979f02336 am: e3638a1782

Original change: undetermined

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