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

Change-Id: Id5bcb44f30af067b48e0b200f4fb7df2901cc441