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

Change-Id: I227d13628ee334d475c91020f7be4d5bd47e2c37