Merge "Update permission name for Tag app." into gingerbread