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

Merged-In: I5f4b865f48965e3967c156bcdfe7cde4993b1f92
Change-Id: Ib0c64861fd67118e2c12c9cb44af415f455afaf6