Merge "Remove NetworkParcelable" am: 205886d28f
am: 7201f61c57

Change-Id: Ice0f04749d2b7c2863ad18c29f5967649127ee0e