Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ia79ec94b6a916575dedb1cdea10b26ea78847d96