Merge sc-mainline-prod

Bug: 189946434
Change-Id: I7e6f78ccc7395c4e54aca9c8bd6da9c720c1af1b