Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib96c72519dc0481f5092c6469b88b3dcb0d76fca