Merge remote-tracking branch 'aosp/upstream-master' into aosp am: c5e1fc00dd am: afdbff01ec am: c384aa467b am: 12356e73df am: c646c6b72a

Change-Id: Iae76ba8fa7a565c0f97682827eea8db079a43221