Merge remote-tracking branch 'aosp/upstream-master' into master am: f822f577a8 am: e3a79de276 am: 751f025227
am: 7bdec85d20

Change-Id: Ic2138a14251b92b52c9037f1d1d3bedf8be71da4