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

Change-Id: Ieb777b0c9322fab8c9d9e057090781a264892220