Merge "Fix typo in Parcel javadoc." am: ed0e6009df
am: d29e275b5b

Change-Id: Id1fa7cc2948153697c8c34a2e4db632153218162