Merge sc-mainline-prod

Bug: 189946434
Change-Id: I9e3cf03e7e6b97026ca90b4389a4c8fe55894993