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

Merged-In: Icc2e10d6b9652c879e1abc0d2ad2ff6596ba45b2
Merged-In: I7cc9d864a1bda1fcf192b14f37e70f64a5ba5218
Change-Id: If677825150f746d2360c0c2dd5204f612c0425bc