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

Change-Id: I261e7799fb181117ac5f5f3783f2ce55c8c3c6b6