Merge "Store relative paths in the profile file"
am: 1660d214de  -s ours

* commit '1660d214de55678c97defef10395f6f9d184e1fa':
  Store relative paths in the profile file