Merge "Update for removing read/writeEmbeddedFrom/ToParcel methods." am: 8cc1343724 am: 2187dc5ca1 am: 41579ea4d4
am: 8afcb67a89

Change-Id: Ib6657958538c75814f9e5afd17c9446e3a8ff7fe