Merge "Protect history broadcast" into rvc-dev am: c2a60e9485 am: f49a080dbb

Change-Id: I90fe91cdd82066a507a7c9be3b2ff624249bbda2