Support for new ID serialization format

Change-Id: I33b03d4bac6e3edd065f36b1c750b8d9fae09e63
Merge "Support for new ID serialization format" into mw1.22-wmf6