Merge sc-mainline-prod

Bug: 189946434
Change-Id: I6b510895f27575d1cb7b797780c1aeeb8fa0cca1