Merge remote-tracking branch 'aosp/upstream-master' into HEAD
am: 05a93307bd

Change-Id: I25ef30a7d7b319bdde151b4b5c1f00b5450f3db0