Merge sc-mainline-prod

Bug: 189946434
Change-Id: I45a3dcc6fedde6fb041b4905293f299ba87e2b50