Merge "CDD: O errata changes" into oreo-dev am: c5356bbfa3
am: ac54447388

Change-Id: Id885da4c2544c20117e94d0b86922e6fb898ca51