Merge changes from topic "am-6b3a730c-972e-4db8-b070-71dfdb9cc78e" into r-keystone-qcom-dev

* changes:
  [automerger] Use realpath to grab underlying path for userdata am: 07183df967
  Use realpath to grab underlying path for userdata