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

Change-Id: I2159b0ebe93cab917f27597ffeb446f4f49347dd