Merge "Version bump to OMC1.180615.002" into oreo-mr1-cts-release