Merge "Fixes for notification history" into rvc-dev am: 5c4c2ed6b3
am: 9768e4417b
am: 122e878967
am: 6e1aec5231
Change-Id: Ia4991ca33d7784e520a5a3530c8dbd0deed11f96
This commit is contained in: