Merge remote-tracking branch 'origin/upstream' am: b636849df3 am: 4d1dca7814

Original change: undetermined

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