Merge sc-mainline-prod

Bug: 189946434
Change-Id: I9468c0d7cba1488775e952d82147b7950bee41a4