Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 8f76b0cd3e am: 6cef90d0ee am: 3e07fa5fa2
am: 3a38dcba11

Change-Id: I425998e49f4a7989636d8aa016f31f58510ea358