Merge sc-mainline-prod

Bug: 189946434
Change-Id: I0c310119651d9a376870ea74c9d24d5595b20a53