Merge "Sync QPR1 branch with AOSP"