Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id7e5f482018f7e772bb1f8198f336f0c0fffb66f