Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id4c37d575cd779c19864be4bbcca05ae9c08eadd