Merge sc-mainline-prod

Bug: 189946434
Change-Id: I0ac8cacef768ce40848bd1c096bcf6c71ff58158