Merge sc-mainline-prod

Bug: 189946434
Change-Id: I59a11b7e743ec1625931e9420bae9f03a93fd34d