Merge "Don't keep parceled extras for history broadcasts." into oc-mr1-dev am: 4fdefef7a1
am: f880d1f9af

Change-Id: I269a85d171d636c4286b6ed4fdc3393e09c8162b