Merge "fix DocumentsUI tests makefile" into nyc-dev