Merge remote-tracking branch 'aosp/upstream-master' into mymege am: 97f1ad6591
am: a36f6bc864

Change-Id: I18109119153be66b3818830c083a9cae2fec55ad