Merge "Temporarily re-add methods and classes removed in ag/1420175." into sc-dev