Merge sc-mainline-prod

Bug: 189946434
Change-Id: I13a039e8ad62cbd5fe38699876ff2d70fd4b4934