Merge remote-tracking branch 'aosp/upstream-master' into aosp am: ccb30116c0 am: 99de2a1d02 am: 999bd52eee

Change-Id: I8acaee197dfe382a56d2ee3e371c1d93b5360b6e