Merge sc-mainline-prod

Bug: 189946434
Change-Id: I37818b8e3ad8c9fc3c8e15ad1a45704cd06066d5