Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ie1b93a30a472fa8c6be4f7fb34081184c5bbc80b