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

Original change: undetermined

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