Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ia8aad2e238a8e17a9c5882db0de6e67d7d34da9f