Merge "Rename file to satisfy strict Java requirement" into jb-mr1-dev