Merge sc-mainline-prod

Bug: 189946434
Change-Id: I5aacc8c8bce2c2e5e9592de32b707bf1221cb19f