Merge sc-mainline-prod

Bug: 189946434
Change-Id: I34e65f1765371755a217703e4345230e4feb0ac4