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