Merge sc-qpr1 to aosp-master - DO NOT MERGE
Merged-In: I90ca5ccbf686a975f479c2488ff34f82af12946a Merged-In: I128f5ed6c1bad350ea449bba5da21123de3ea31b Change-Id: Ib18c8042f735dceeee5e6ab9f1c963cf630913a6
This commit is contained in:
Merged-In: I90ca5ccbf686a975f479c2488ff34f82af12946a Merged-In: I128f5ed6c1bad350ea449bba5da21123de3ea31b Change-Id: Ib18c8042f735dceeee5e6ab9f1c963cf630913a6