Merge "Cleanup blur test, remove deprecated functions." into jb-mr1-dev