Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 9a79a752c7
am: f8578bddcb

Change-Id: Id32132ee0b7421d01a95463763d134bc79f9454d