Merge "Allow to drop existing fd cache of cgroup path" am: 1e13891988
am: 9b54f0f73c

Change-Id: I9a7f22da7af150070e4965806eb4e1ea25cbf1bc