Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iabdfe5f7c6f99c2e00b2b87c169042de4e4318a1