Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3
am: a4fe9e7b6f
am: 93fd474883
am: 0aba996688
Change-Id: I3430f410fbfaec4bffb6af168ff414bf7b804fb1
This commit is contained in: