Merge sc-mainline-prod

Bug: 189946434
Change-Id: I61dcc2f0ec7813beaa89e021f6bcb33d4ae054db