Merge sc-mainline-prod

Bug: 189946434
Change-Id: Ic242cf9121edd79c5812235dfd3f2b4545d3cec6