Merge sc-mainline-prod

Bug: 189946434
Change-Id: I4f1df3fcad196f3edd65e77ceca510bbe47bf29d