Merge "Fix FakeUserHal issues."