Merge sc-mainline-prod

Bug: 189946434
Change-Id: I65dd46d331ab798863b3428d746d8004340ee57a