Merge "Fix issue with history deletion" into rvc-dev am: aec73f132b am: b96aaf7fc6 am: f0c5d0804d am: 432a36a883
Change-Id: I8f2702debc743bdd6db6267e44cc9f0072630b1c
This commit is contained in: