Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: f13a30b95a am: f94df79156
am: 7848dd96ad

Change-Id: I8c2a9ad2934cc8b0d95dbe4323d6f15540602099