Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ied28b6b27b28baeae73df7b9e5030b5ec3f37adb