Merge "Remove unnecessary pathmap usage"
am: 8a288e1fbd

Change-Id: I2c2e23e99e8b59462ccf965072bdbc6a05cf2c78