Merge remote-tracking branch 'origin/upstream' am: eac25a1fec am: c6a64b95a3

Original change: undetermined

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