Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: bdf5d72c1b am: d487ba5aa5
am: 2a6465beb6

Change-Id: Ia461d2f654df3099aa1b32c60793afd123d47f5d