Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods."
am: 8cc1343724

Change-Id: If003adc06673d8e6c6db6f8a5d858dcca7aed109