Merge "Use realpath to grab underlying path for userdata" am: 6e2fd776ae

Change-Id: I56d00f7b2d175c089e39dd15a00b28ce9b652c6a