Merge "Remove notification settings for deleted users" into oc-dev am: c50b731f0f
am: 8c0f813e4b

Change-Id: I2bc370910e4519d045f6a9498544a063189a2b50