Merge remote-tracking branch 'origin/upstream' am: 17f307710a am: 367703b09d

Original change: undetermined

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