Merge "Adding permission annotation as per API review"