Merge remote-tracking branch 'aosp/upstream-master' into aosp am: c5e1fc00dd am: afdbff01ec

Change-Id: I827fe60f9a048919b889867f639a6dec0c5727e1