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

Change-Id: I64478bb3a9b8e8222c084ad22fe6205b595f386c