DO NOT MERGE. Use resolved path when inserting and deleting.
Jeff Sharkey [Thu, 18 Feb 2016 19:36:42 +0000 (19:36 +0000)]
am: ebb842e081

* commit 'ebb842e081f2d9eddbeddb9447631fd81e8961b9':
  DO NOT MERGE. Use resolved path when inserting and deleting.


Trivial merge