Merge sc-mainline-prod

Bug: 189946434
Change-Id: I73df50a92f075bb2260175926269d7e0b88f41a1