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

Change-Id: I33223887a6807d2f3caa81df3ead1caa10a015ea