Merge sc-mainline-prod

Bug: 189946434
Change-Id: I1a44867ed70b7c1e9a67a2dafc824e75d2ff5cb8