Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: e3d7edcfce
am: e04a40db4c

Change-Id: Ifa8007608f5968c9dbd621bbba4b8e2cadbf90fa