Merge "Remove poorly defined notification APIs." into pi-dev