backout 578bf8d6363c for causing robocop pan regression
Merge fx-team to m-c a=merge