Merge "CDD: O errata changes" into oreo-dev