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

Change-Id: If0919864026c78fed76df1554235c2acca9f2750