Merge remote-tracking branch 'aosp/upstream-master' into cleanup am: 386cca88c6
am: 68395b2cdf

Change-Id: Ic85f9f9ac4f9aa3c30f81f96d25988d44d0391f5