(no-ticket) ACM should support old repr format for reserialization

Change-Id: I7f9dfc42957699109c5a70fbd01698e25fd6ac99
Merge "(no-ticket) ACM should support old repr format for reserialization"