Merge sc-mainline-prod

Bug: 189946434
Change-Id: Icf6c778cdf56e020397d740af07d086a8fc056db