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