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

Change-Id: I54ae14331c7f99cc6a193e000f3146bd4221c6c3