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

Original change: undetermined

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