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

Change-Id: I3aaa746c9d670c3841d1a874814484a73d1f6898