Merge "Check for the correct userId in callbacks"
am: 6692f8b5f2

Change-Id: Ib0837adc9b0c5676f81836592dbb2d9e6d264814