Merge sc-mainline-prod

Bug: 189946434
Change-Id: I8817bfd25a22cac7a6b0fefec7c731c2b87f786b