Merge "Updated the description for APPLICATION_ID and APPLICATION_DATA"