History in '4 hours ago' should not be included in 'Today'

Change-Id: Iecfa74989cb409db799e500d701f29d06a40dd2e
Merge "History in '4 hours ago' should not be included in 'Today'"