Merge remote-tracking branch 'aosp/upstream' into merge
am: 40d8c975c7

Change-Id: I52e69188a56dfcef6353311830dad274f63b37c7