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

Change-Id: I8871b98e8168b68a0a8672ee290cb43bdfb2eeb0