Merge "Check for null path in getInternalPathForUser" am: 0559afdbcc am: c2861c5698
am: 8c5a362231

Change-Id: I16e4a8694d9a8a58f59e9f10a9df377ee6e7c2e1