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

Change-Id: I62568a509cabbe058b91160542dc78f9eed90223