Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 90cef9e6c8
am: 2a865182e5

Change-Id: I946716e9cf503a08f4244b2fb3b7c2087224572b