Merge "Remove unnecessary pathmap usage" am: 8a288e1fbd
am: 4a17304cc2

Change-Id: If9457c19447486d39a6ccff8dde595f732958d0f