Merge remote-tracking branch 'aosp/master' into jb42-master

Change-Id: I5b1644d4f8d0e86427e300a76b515bd83433bca4