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

Merged-In: I610c38c3dfa143a57a744ddf8de5be930b00abff
Merged-In: I71258c6be83f1dd264c8be7445c08bb726b432ed
Change-Id: I2ec41562b311894742615d7a3e4237085162db46