Merge sc-mainline-prod

Bug: 189946434
Change-Id: I18bc4dbb17086dcf923d43a02c5274dcff822f71