Merge sc-mainline-prod

Bug: 189946434
Change-Id: I655cad8e1f31616b6198bf3bdc1f2df2d290b365