Merge sc-mainline-prod

Bug: 189946434
Change-Id: If384c862f14c2daeeea2cdc02ae55c8859e08f25