Merge remote-tracking branch 'origin/upstream' am: f962d0c54d am: c3524e6b9d

Original change: undetermined

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