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

Merged-In: I7d34391e1cf7e02260433f7f4708e3eb7ec84aec
Merged-In: I275c69522adc49df9e82e4f392b68c3d6b0e3db2
Change-Id: I0a696e919befe5e46011a04c2ba38bdcf1f07635