Merge sc-mainline-prod

Bug: 189946434
Change-Id: If7d95d41073c8d4f8c8416ebbb02a9135939db5a