Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 077ac9bc38 am: 6a56e171ac
am: ccf3198d48

Change-Id: I00b6951fc40d8483495eb2def1a214cf39afc4f7