Merge "Update comment for generating IntDefs mapping"