Merge sc-mainline-prod

Bug: 189946434
Change-Id: I8f01788681f66ff68cd4b2aeccdcce5c9bf57c1e