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

Change-Id: I46ef7d76efd18e9e5409f4448e7bc2781bc7bf12