Merge remote-tracking branch 'aosp/upstream-master' into HEAD
am: 8345f0a664

Change-Id: Ie81703709a36cc6cb3fc43d55245397ccbf5494d