Merge remote-tracking branch 'aosp/upstream-master' into import am: d8871eeb9d am: 999ffef6a3 am: 1a8016e4ac Change-Id: If87d483d75485f260beac54f1f37dcd9f0203a12