DO NOT MERGE: Don't throw RuntimeException in user dir delegations.

Bug: 25374338
Change-Id: I3b56d33292c0c0d7c6e4ac75c5ce37b1659de8ba
2 files changed