Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ifa32d2c099f4ccd6e9abd1fb9ba58fd15342f8d3