Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ib73d3091ac7eea5101a7893a57f8a60bc1eaf78e