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

Merged-In: I3d0356a797b42e1bb9560704c455688397d03e4c
Change-Id: I745c30269d26b5bef2e5330b565db0cffa3712f5