Merge "Add compile time check that friendly AID names are < 32 characters"