Merge remote-tracking branch 'origin/upstream-master' into master am: bc0d32c531 am: 2d41fa5ba9
am: d62e011446

Change-Id: Iab0436dad8e2e9bee6af64f803f50622f6862d4c