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

Change-Id: I1cdaa2edf886e8a00d885363deb85d9d22383e13