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

Change-Id: Ia8f41eb4c76c241088a4cce368409bd61deb5d35