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

Change-Id: I9559e717dfd33adbe319a95caa5d98ebda5727c8