Stop deprecated parcelables triggering Error FW8

Test: Ran against system-current with and without the cl.

Change-Id: I492e211701b16e660bbc57913220a93df1ed31ac
1 file changed