Track CM's aries-common

Change-Id: I81649597e46fb14a7ada08022e57d95730ee0629
Merge "Track CM's aries-common" into jb2