* Cherry-picking 7b2861de3a to master because enterprise/master has code in it that enterprise/release-4.7 does not, and I don't want enterprise/master to break the next time somebody merges enterprise/release-4.7 to enterprise/master
* Renamed file to match existing scheme
(cherry picked from commit 8c22c5c6c6)