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

Merged-In: Ia3c74479d7024c839926e9f6f4524f255bd712f4
Merged-In: Ie878124f3c48c634af0d08be8ad30898b1dcecc2
Change-Id: I4dd3b4e19093ee3727632dd1863777b0710209b9