Merge sc-mainline-prod

Bug: 189946434
Change-Id: I692539fc73e7fa46f17e16d248bd3210239118f5