cp errors

Change-Id: Id83f9306fc5bc5f21941fe98dd5e1aed17a516c1