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

Merged-In: I3f228ae170a3a5f2478136dc0a23a45d3ce6a044
Merged-In: Ie750160ac8f56153a775dcf3e5841b18fc441945
Change-Id: I711c0e92b4e815c790925c7d583cb5e8e1c19d61