Merge "Remove un-needed code in NotificationManager." into klp-dev