Merge "Add an override for getUser in ContextWrapper"
am: 5a049f5cf2

Change-Id: Ia69ca6ab1e5f34ac3ac5a16aff8a45ac92de0f9d