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

Merged-In: Ice7b502c830b21f9964502c4b1f5d77ccbff9c29
Change-Id: Ic4e8108ccb5816e3616b446fba3d140a86c73a59