Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic702f82b87cb5be6e09e4bf65d26dc5fb8963648