Merge sc-mainline-prod

Bug: 189946434
Change-Id: I1aeaa114ae54c31055117257ddd10b08d9f983c3