Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ibc3f164ac956e0b14dc95aa369bb323a516c94bd