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

Original change: undetermined

Change-Id: Ia1a307e22a36abb2780fa4a34bae0f37365179d8
Signed-off-by: Automerger Merge Worker