Merge "Add comments to apptype and authtype constants." into nyc-dev