Updated to min reqd gradle version and play services 6.5
Merge changes from remote