Merge "Don't insert entries with trailing slash" into nyc-mr1-dev
am: d89181d1fe

Change-Id: I8e30548d0930cfda8f243db19a35b6f1d7c50e5e