Merge "Further bulletproof NotificationInfo's public api from exceptions" into oc-dev am: 390cdab4 am: 442a4e4c Change-Id: I9de7dc27370a73da838c7c5540faa6542e4a9432