Merge remote-tracking branch 'aosp/upstream-master' into master
am: 9ba7a6cafc

Change-Id: I6fa68165ff9f6fb06bb7d92ced2aeb9564683caf