Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: bea3b4ca9b am: b47b6bc2e9
am: 12652897f7

Change-Id: Iaf075c1251ff59b0f4e52949f1b26be1542637c0