Merge remote-tracking branch 'aosp/upstream-master' into mymerge

Change-Id: Ibc952037986c546d20e75479fd2983d07111ff88