Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ia0f23f7b7cf2a94914a6881e63a9f380fb16efe4