Merge "Make change and version bump to OCR1.180816.001" into oreo-cts-release