Merge sc-mainline-prod

Bug: 189946434
Change-Id: I07cd8d697c0a32f68689f8d656c499a6b82aafd5