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