Clean up the use of profile_key / dex_locations am: 4ba700af65 am: 1e7f562286
am: 8f4dc9b0ff

Change-Id: If27cf909df91192c80f241a2e4c9f9865d4157c5