Merge "Removing OPR1 from master as OC is API26"