Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iea42d539929f3bbb0e36a9c51e5d414bcfebc469