Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id53d27e89ceb8d38e72d371e5849d752053b4d8c