Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ie71e3b2dbf368fdd488a4e489f3b7f78328ae722