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

Original change: undetermined

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