and account for small differences when using an IDE other than eclipse Change-Id: I1ea8a00cd3d03623a43d6b5f75234095130c0aa3