Merge "Fix idmap calls when a subdir is present." into cw-f-dev am: 42f40b159f
am: 6ba7dabc91

Change-Id: Ibf266357d7e96683f801660ad4cf538d002ec821