Support for new registry format

Change-Id: Id117ed6dd6081383f09488ff67209e23be61aebc
Merge "Support for new registry format"