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

Original change: undetermined

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