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

Change-Id: Iac321a7fefcd28ba02d7b14e20fa912e7f4b1841