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

Change-Id: Icfde7189f87a490b02db48eabbe4287916196ece