Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."