Merge "Fix new notification showing timestamp "now" after turning off DND" into pi-dev
am: 929ea36157

Change-Id: Ic5e6c30d8219258f3393e237bb0c671de446f9c5