Merge sc-mainline-prod

Bug: 189946434
Change-Id: I54b2d22fc3cb6f4b537cd5a3c79390ea2a760244