Merge remote-tracking branch 'aosp/upstream-mirror' into mymerge4 am: 57c4696069 am: 51f53e42ce am: cff0d00447
am: e81fe27fe3

Change-Id: I541e9fbcc925268c230e5343f1d263726f45ac38