CDD: O errata changes
am: c2ee361651

Change-Id: I6f228ef3344e6826a10f4a052a9f9af5b3971c81