Merge sc-mainline-prod

Bug: 189946434
Change-Id: Id72eec4d0eba7acb06246e7f43d38da89f6506ea