Make notifications code ICS compatible.

Change-Id: Ie91183c8fd8cb48d5f5acc40335e6e123d34d56f
9 files changed