Merge sc-mainline-prod

Bug: 189946434
Change-Id: Icb129036eb37610bf7ae3b236788a3e369de4476