Merge remote-tracking branch 'aosp/upstream-master' into master am: 9ba7a6cafc am: 5f3f49a2c7
am: 2acb94f8dd

Change-Id: I2ff0bffe4e33a9b08c37becc1c057f2dc825a8f7