Revert "Reverting version to 1_5_R2 to see if it works."

This reverts commit b2bb98080774dea0962828fbed205150d5ff2af6.