Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: I05a0c2f49b9859f14df182bea5a9c3b44ce9b53d
Change-Id: Idc9c3a6691582aa08232698333b87a218aba1eea