Updated for Eclipse

Change-Id: I29e515dc8c5af4992433d8b91b59f51f3c5a3eb9