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

Merged-In: Ice4076814a54950e4a9ad8efeac4eb2f2531c75f
Change-Id: I0311e0abb454fc9b7bdb1e9aaa5a380d6505830e