Merge "Update aai-common to 1.14.2 in resources"