Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic7d71c48609fb51c896f471e25db16086671e129