Merge "Version bump to OCR1.180615.001" into oreo-cts-release