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

Change-Id: I8370a4d376a02c8a16bdb1ebe5ff58a20ca0989b