Merge in latest commits from AOSP master and fix merge conflicts
Attach a file by drag & drop or click to upload
