Created attachment 13795 [details] git-am fix cherry-pick from master for 4.7.next.
Created attachment 13796 [details] Back-port of cherry-pick from master - git am for 4.6.next.
Pushed to autobuild-v4-{7,6}-test.
Pushed to both branches. Closing out bug report. Thanks!