Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic869fe2cb6f415964dc9e805e3cb27f26b96471e