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

Merged-In: I3d2d80ed53c5726a35a7d1ca43cafe9c45c127f4
Change-Id: I5f79c277a76c4994914c6e7611338dded991644f