[sr-dev] How to cherry-pick from master to 4.4 since file paths have changed