Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib2e2e2a517566c408d45bcc9f2b7e1b01700a4d4