Merge sc-mainline-prod

Bug: 189946434
Change-Id: I5b644f004b7d2147c1e3e558e28cf33c3a65bd1f