Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE"