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

Merged-In: Id81bbc5f4a9f476491e238d6accf9d96c8ca2a9a
Merged-In: I6a15d64f80279128508c0a0288525214a8a255db
Change-Id: Ibb71116c53aba844f34272d985b73e8ac2c2643b