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

Change-Id: Ia6b367a670d9ae537b910ace8be719b256076f18