Merge sc-mainline-prod

Bug: 189946434
Change-Id: I5fa6c457474ca380b72b583f7a934a2f8043b533