Merge "Remove poorly defined notification APIs." into pi-dev am: 36efb71088
am: d6e49befda

Change-Id: I6689556635b2ee8e56aca7325596e32efdc7311b