Merge changes from topic "no-realpath"
am: 279ddffe81

Change-Id: I1b3d314b15646ee474f3243ef66ed1249c606734