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

Change-Id: I9bfa28b66b98707dc9efdb28872f217412611d09