Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev
am: 390cdab47c

Change-Id: I422d6b7627378a949c4fbe53098edb0fef1b3050