Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ie5193cbb7d784f92504547ff68d1324219acc8b1