Merge sc-mainline-prod

Bug: 189946434
Change-Id: I93eac2de1d42bf370b6ff2289f45ca86ae3b5f9b