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

Merged-In: I50dd8d3869944602e05492aaf3d4b9501676067f
Merged-In: I4a6c3d388057645a1e36c975352dacca83c1bddc
Change-Id: Ia657402465eb9e33ac4712d6439add755f3171f6