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

Change-Id: Ice1528d34191d08dc6040b7da3c626e2f4489330