Merge sc-mainline-prod

Bug: 189946434
Change-Id: I71d13a56f9d3c3f5fd6d20c5aec2987bf3669a34