Merge sc-mainline-prod

Bug: 189946434
Change-Id: I3d0b3edccd0c7835fc84383a7645cad16a14bab6