Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic3191b0e5d0cd2b58be446cbd6acfa31014f468a