Merge sc-mainline-prod

Bug: 189946434
Change-Id: I91dec6d291963376dc2001a68933989f97f8b409