Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ia785e81876f708250d38c81bb0702077a1a177e6