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

Change-Id: I931c857ad5c205df9cd244af6828d1d3abbd2afa