Merge sc-mainline-prod

Bug: 189946434
Change-Id: I968fa0ee332ae1c835e65377b479e74cb6e25fb7