Merge remote-tracking branch 'origin/upstream' am: 7b05fe7bc2 am: fd146a0f2f

Original change: undetermined

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