Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id18e08ce60fc70b8c02b2ea5277a88cbf9f7bf1c