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

Merged-In: I46d6af12c92cdf470ade3c38eedfc7a52b1c0517
Merged-In: I00d8ada286d6004e02dcaf7c76957e90e7175ce4
Change-Id: Ibd64287d6ea539777f0aaed5a691672addef2b37