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