Merge "fixes in AAIResponseMessageData.java"