Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 68b94c0fae am: 344722436b
am: 7a477bc410

Change-Id: I3201b4edf82aefeffd8d88554f202e897265ae05