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

Merged-In: I1ab0e42437ef8c2acdf7e93863c21197b4731e5f
Change-Id: I38da9f192d57688b1b05bb2bf41ce33f87a60807