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