Merge "Whitelist noti listeners on user creation" into oc-mr1-dev am: c40a360ac6
am: 3ff84e5e37

Change-Id: Iaad1aeec192b02fc659e233427d9d6c0075c3334