Merge remote-tracking branch 'origin/upstream' am: 99cde8603b am: bbc2d0cbd6

Original change: undetermined

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