Merge remote-tracking branch 'origin/upstream' am: 376dbbaa15 am: 5aba5345e6

Original change: undetermined

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