am 21a6c8a9: am 4d89e2af: clean up backup imports

* commit '21a6c8a9045c6a1e857fddf6ef7043c35114729f':
  clean up backup imports