missing/wrong files

Change-Id: I74bda57e1a68014f20c6c201f1074bcc2dc17240
fixed compilation

Change-Id: I693c82cbf8395598ddf49739d2f4f85970ed56d8