Merge sc-mainline-prod

Bug: 189946434
Change-Id: I88bf36e40e63320ddbddfe6c5de0f6e4f453dfa8