Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: b4854a24d3 am: dedb1edb34

Change-Id: I8020f50cfc07c02cbb544fd6587be7b13d760209