Merge "Export path to profile (to be used by other modules)." am: 831cad71f3
am: 7bc195867c

Change-Id: I0a7ab32b52b4723d47210adf6bf3b01119d2af73