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

Merged-In: I105e05b7eb9545053dec059742b38f7e676ddfed
Merged-In: Id95d5ed172672f205b55acd68acebfbd3087551e
Change-Id: Iff5cbe84b1e7caf74b7b5500da3b3c190fc577ee