Merge "Fix to register the receiver for all users" am: c72866785a
am: 29a43554ab

Change-Id: I6210f0c4a8705752a4597a04cf45f5f5709e0c9f